Autogenerated HTML docs for v1.5.3.4-319-gdd817
diff --git a/git-merge-index.txt b/git-merge-index.txt index 17e9f10..b726ddf 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt
@@ -40,7 +40,7 @@ processes them in turn only stopping if merge returns a non-zero exit code. -Typically this is run with the a script calling git's imitation of +Typically this is run with a script calling git's imitation of the merge command from the RCS package. A sample script called "git-merge-one-file" is included in the